remove concept of root objects and just refcount all objects in the

2006-11-26  Ryan Lortie  <desrt@desrt.ca>

        * gtkbuilder.c: remove concept of root objects and just refcount
        all objects in the builder.  Fixes #496651.

svn path=/trunk/; revision=19074

diff --git a/ChangeLog b/ChangeLog
index 4e49b0ebdd4ed9e218ff84b0fb92aa3005dee8e4..24ca93e3ad5ff17959653d8b0285e5f7d7be730e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-26  Ryan Lortie  <desrt@desrt.ca>
+
+       * gtkbuilder.c: remove concept of root objects and just refcount
+       all objects in the builder.  Fixes #496651.
+
 2007-11-26  Ryan Lortie  <desrt@desrt.ca>
 
        * tests/buildertest.c (test_window): fix invalid free

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 22feceb720a23957b70920ef2d8bf9cd959961f5..5f6e1dff88faecc8a6dfa91d55b6829d4847a636 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -67,7 +67,6 @@ struct _GtkBuilderPrivate
   GHashTable *objects;
   GSList *delayed_properties;
   GSList *signals;
-  GSList *root_objects;
   gchar *filename;
 };
 
@@ -114,7 +113,7 @@ gtk_builder_init (GtkBuilder *builder)
                                                GtkBuilderPrivate);
   builder->priv->domain = NULL;
   builder->priv->objects = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                                  g_free, NULL);
+                                                  g_free, g_object_unref);
 }
 
 
@@ -135,9 +134,6 @@ gtk_builder_finalize (GObject *object)
   g_slist_foreach (priv->signals, (GFunc) _free_signal_info, NULL);
   g_slist_free (priv->signals);
   
-  g_slist_foreach (priv->root_objects, (GFunc) g_object_unref, NULL);
-  g_slist_free (priv->root_objects);
-
   G_OBJECT_CLASS (gtk_builder_parent_class)->finalize (object);
 }
 
@@ -406,7 +402,7 @@ _gtk_builder_construct (GtkBuilder *builder,
       g_assert (obj != NULL);
       if (construct_parameters->len)
         g_warning ("Can't pass in construct-only parameters to %s", info->id);
-
+      g_object_ref (obj);
     }
   else if (info->parent && ((ChildInfo*)info->parent)->internal_child != NULL)
     {
@@ -414,6 +410,7 @@ _gtk_builder_construct (GtkBuilder *builder,
       obj = gtk_builder_get_internal_child (builder, info, childname);
       if (construct_parameters->len)
         g_warning ("Can't pass in construct-only parameters to %s", childname);
+      g_object_ref (obj);
     }
   else
     {
@@ -421,6 +418,18 @@ _gtk_builder_construct (GtkBuilder *builder,
                            construct_parameters->len,
                            (GParameter *)construct_parameters->data);
 
+      /* No matter what, make sure we have a reference.
+       *
+       * If it's an initially unowned object, sink it.
+       * If it's not initially unowned then we have the reference already.
+       *
+       * In the case that this is a window it will be sunk already and
+       * this is effectively a call to g_object_ref().  That's what
+       * we want.
+       */
+      if (G_IS_INITIALLY_UNOWNED (obj))
+        g_object_ref_sink (obj);
+
       GTK_NOTE (BUILDER,
                 g_print ("created %s of type %s\n", info->id, info->class_name));
 
@@ -472,15 +481,7 @@ _gtk_builder_construct (GtkBuilder *builder,
                             g_strdup (info->id),
                             g_free);
 
-
-  if (!info->parent && !GTK_IS_WINDOW (obj))
-    {
-      if (g_object_is_floating (obj))
-         g_object_ref_sink (obj);
-      
-      builder->priv->root_objects =
-        g_slist_prepend (builder->priv->root_objects, obj);
-    }
+  /* we already own a reference to obj.  put it in the hash table. */
   g_hash_table_insert (builder->priv->objects, g_strdup (info->id), obj);
   
   return obj;